bitkeeper revision 1.1339 (42664beb9pIazYZQ7Q7VrSdT1GCS1w)

Hand merge

Signed-off-by: michael.fetterman@cl.cam.ac.uk

diff --cc xen/arch/x86/domain.c
Simple merge

diff --cc xen/arch/x86/mm.c
Simple merge

diff --cc xen/arch/x86/shadow.c
Simple merge

diff --cc xen/arch/x86/vmx.c
Simple merge

diff --cc xen/arch/x86/x86_32/mm.c
Simple merge

diff --cc xen/common/grant_table.c
index c0c99481e75ed70c58af4712076f8c6afc3ae879,44146ed867190b4fdd401045c99097f73705aed0..b2cf2019792f4079320d050ae36814d047fe234a
--- 1/xen/common/grant_table.c
--- 2/xen/common/grant_table.c
+++ b/xen/common/grant_table.c
@@@ -254,16 -251,17 +254,16 @@@ __gnttab_activate_grant_ref
  
      if ( (host_virt_addr != 0) && (dev_hst_ro_flags & GNTMAP_host_map) )
      {
 -        /* Write update into the pagetable
 -         */
 +        /* Write update into the pagetable. */
-         rc = update_grant_va_mapping( host_virt_addr,
-                                 (frame << PAGE_SHIFT) | _PAGE_PRESENT  |
-                                                         _PAGE_ACCESSED |
-                                                         _PAGE_DIRTY    |
-                        ((dev_hst_ro_flags & GNTMAP_readonly) ? 0 : _PAGE_RW),
+         l1_pgentry_t pte;
 -
+         pte = l1e_create_pfn(frame, _PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_DIRTY);
+         if ( !(dev_hst_ro_flags & GNTMAP_readonly) )
+             l1e_add_flags(&pte,_PAGE_RW);
+         rc = update_grant_va_mapping( host_virt_addr, pte, 
                         mapping_d, mapping_ed );
  
 -        /* IMPORTANT: (rc == 0) => must flush / invalidate entry in TLB.
 +        /*
 +         * IMPORTANT: (rc == 0) => must flush / invalidate entry in TLB.
           * This is done in the outer gnttab_map_grant_ref.
           */
  

diff --cc xen/include/asm-x86/mm.h
Simple merge

diff --cc xen/include/asm-x86/x86_32/page.h
Simple merge